Autogenerated HTML docs for v1.7.5-rc0-131-gfa38c
diff --git a/git-submodule.txt b/git-submodule.txt index 3a5aa01..1a16ff6 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -101,9 +101,10 @@ currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not - initialized and `+` if the currently checked out submodule commit + initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing - repository. This command is the default command for 'git submodule'. + repository and `U` if the submodule has merge conflicts. + This command is the default command for 'git submodule'. + If '--recursive' is specified, this command will recurse into nested submodules, and show their status as well.
